From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Thu, 21 Apr 2011 02:22:56 +0000 (+0000)
Subject: shr.el (shr-expand-url): Protect against null urls.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~4080
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=35f56ed1c5b10a6b2b343c1608b7235479cf2049;p=emacs.git

shr.el (shr-expand-url): Protect against null urls.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 7b4a82af137..930844fd7f5 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* shr.el (shr-expand-url): Protect against null urls.
+
 2011-04-20  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* shr.el (shr-base): New binding.
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index f27705e0bf5..ee231e6a82f 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -397,7 +397,8 @@ redirects somewhere else."
 (defun shr-expand-url (url)
   (cond
    ;; Absolute URL.
-   ((or (string-match "\\`[a-z]*:" url)
+   ((or (not url)
+	(string-match "\\`[a-z]*:" url)
 	(not shr-base))
     url)
    ((and (not (string-match "/\\'" shr-base))